Problem

The LanguageServerWrapper class retained disposed Project instances as keys in the static projectToLanguageServerWrapper map, causing a memory leak as reported in Android Studio's memory profiler:

(root): java.lang.Class(org.wso2.lsp4intellij.client.languageserver.wrapper.LanguageServerWrapper)
(static): java.util.concurrent.ConcurrentHashMap
table: java.util.concurrent.ConcurrentHashMap$Node[]
[]: java.util.concurrent.ConcurrentHashMap$Node
key: com.intellij.openapi.project.impl.ProjectImpl (disposed)

When a project was closed, the Project reference was never removed from static maps, preventing garbage collection and causing memory to leak over time.

Root Cause

1. Project instances were added to projectToLanguageServerWrapper in the constructor
2. LanguageServerWrapper instances were added to projectToLanguageWrappers when created
3. When projects were closed, the projectClosing() listener did not:
   • Stop the language servers
   • Remove the Project from static maps
   • Remove wrapper references from tracking collections

Solution

This PR introduces minimal, surgical changes to ensure proper cleanup:

1. Added LanguageServerWrapper.dispose() method

A dedicated cleanup method that removes the Project from projectToLanguageServerWrapper. This is separate from stop() because:

• stop() is used for both temporary stops (reconnect/restart) and permanent stops (project closing)
• Removing the project during stop() would break forProject() lookups after reconnects
• dispose() is only called when the project is actually being closed

2. Enhanced LSPProjectManagerListener.projectClosing()

Now properly shuts down language servers and cleans up resources:

wrapper.stop(true);      // Shutdown the language server
wrapper.removeWidget();  // Remove UI widget
wrapper.dispose();       // Clean up static map references
IntellijLanguageClient.removeWrapper(wrapper);  // Remove from tracking maps

3. Enhanced IntellijLanguageClient.removeWrapper()

Now removes wrappers from projectToLanguageWrappers map and cleans up empty sets, preventing indirect retention of Project instances through wrapper references.

Impact

• ✅ Fixes reported memory leak of disposed Project instances
• ✅ Minimal changes (3 files, 19 lines added)
• ✅ No breaking changes to existing functionality
• ✅ Wrapper reuse for reconnect/restart scenarios still works correctly
• ✅ All static maps are properly cleaned up when projects are disposed

Testing

The fix has been designed to handle both scenarios correctly:

• Project closing: All references cleaned up, memory can be freed
• Reconnect/restart: Wrapper instance reused, forProject() still works

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.